-
Notifications
You must be signed in to change notification settings - Fork 203
re #2613 Apicurio Integration #2886
re #2613 Apicurio Integration #2886
Conversation
Kewl, will take a look tomorrow @kahboom |
Mind you, click on anything and you'll see loads of error messages, so there's definitely still work to be done. |
Just an update--there has been a lot put on hold since the Angular 6 upgrade. I've spent quite some time trying to sort out some issues mentioned here, also have a branch to test Apicurio embedding with Angular 6 here: https://github.com/Apicurio/apicurio-angular-demo/tree/angular-6 Seems there is an issue with ng-packagr and likely my configuration settings. Was hoping to ensure 6.x compatibility and that it might take care of the original Yaml.js issue, but it's taking more time than it's worth, so I'll focus on resolving the issue with Angular 5.x first. |
Yep, makes sense! Looks like you need to rebase this PR and do We'll definitely also need to ensure Angular 6.x compatibility though, with that comes some possible rxjs migration. You might want to have a chat with @seanforyou23 on that, he did all the migration work for Syndesis and can probably point you in the right direction for apicurio. |
@gashcrumb - Right, I was seeing that! Looks like compatibility with Angular 6 won't be a problem, I've set up a branch to test a few things and it actually looks like it solves some other issues. So I'll focus on 5 and think 6 won't be a major problem, but of course, you never know.. |
Actually, on rebasing I do bring in Angular 6, so I'll work within the Apicurio Angular Demo for now and sort out this issue later.. may make more sense to close this PR and re-open when ready. |
@gashcrumb - Had to create a window service to deal with the hacky solution in a slightly better manner. I am still running into an error that looks pretty familiar, but I can't tell if it was something that happened during the huge rebase. By the way, apologies for the duplicated commits. I need to rebase more frequently and can squash all the duplicates if you'd prefer. FYI this appears to be working fine now in the Apicurio-Angular-Demo app with the new window service. cc @paoloantinori |
Think you just need to do The error is complaining about this line -> https://github.com/syndesisio/syndesis/pull/2886/files#diff-b25c2fa263e6ff5b15a5e499f0e2f2a8R72 Is that property exposed as an input by the |
Careful with |
@paoloantinori that's mostly a concern for shared branches by an entire team, not so much PR branches. When squashing commits on a PR where the commits have been published, a forced push is required. |
I also squashed the first commit by mistake, which created some issues. 🙈 Next time will try to have a cleaner PR and rebase more frequently. UPDATE: @gashcrumb has kindly been trying to help sort this out, but a little bit more time will be needed for the toolbar issue and apparently some local issues (server errors related to the Minishift instance) I'm having that prevented me from creating a proper demo in time. |
cc @paoloantinori - Sorry for the git mess; this is missing the toolbar and the user won't be able to complete the flow as expected, but we can still get this merged in if you'd like and I can sort out the toolbar issue tomorrow? Your call. |
Hi Rachel, github says that there are conflicts to resolve: Conflicting files Can you fix them with a further commit? |
Add fnx to ApiConnectorCreateComponent
…ow the definition editor
This update contains: * Gap control for separate/combine index (atlasmap/atlasmap#449) * A prototype of data preview mode for single mapping (atlasmap/atlasmap#451)
Upgrades angular core to version 6 Upgrades patternfly Upgrades ngx-bootstrap Upgrades node version Adds rxjs-tslint Adds rxjs-compat (solves issues with ngx-bootstrap) Applies consistant code formatting and new formatting rules Adds new script for linting typescript files Removes unused imports preserve-symlinks flag moved to angular config json
The following vulnerabilities are fixed with a Snyk patch: - https://snyk.io/vuln/npm:tunnel-agent:20170305 Res merge conflicts in package.json Add Apicurio references to ApiConnectorModule Add fnx to ApiConnectorCreateComponent Display editor only on submitting step 2 Pass param via EventEmitter to determine whether or not ot hide or show the definition editor Styling for Review btn, minor changes chore: read swagger document locally and pass to api editor Res merge conflicts
Res merge conflicts in package.json Add Apicurio references to ApiConnectorModule Add Apicurio references to ApiConnectorCreateComponent Add temporary API definition in constructor Add fnx to ApiConnectorCreateComponent Add selector, reference fnx in template Display editor only on submitting step 2 Show or hide editor Pass param via EventEmitter to determine whether or not ot hide or show the definition editor Hide Step 2 to display editor Add reference to existing specification file uploaded Add header for template Cleanup Styling for Review btn, minor changes chore: read swagger document locally and pass to api editor update to patternfly 3.51.2 chore: Update to AtlasMap 1.35.4 This update contains: * Gap control for separate/combine index (atlasmap/atlasmap#449) * A prototype of data preview mode for single mapping (atlasmap/atlasmap#451) chore(deps): upgrade angular core and rxjs Upgrades angular core to version 6 Upgrades patternfly Upgrades ngx-bootstrap Upgrades node version Adds rxjs-tslint Adds rxjs-compat (solves issues with ngx-bootstrap) Applies consistant code formatting and new formatting rules Adds new script for linting typescript files Removes unused imports preserve-symlinks flag moved to angular config json chore: upgrade to patternfly-ng 4.x (partial) fix: app/ui/.snyk & app/ui/package.json to reduce vulnerabilities The following vulnerabilities are fixed with a Snyk patch: - https://snyk.io/vuln/npm:tunnel-agent:20170305 Res merge conflicts in package.json Add Apicurio references to ApiConnectorModule Add fnx to ApiConnectorCreateComponent Display editor only on submitting step 2 Pass param via EventEmitter to determine whether or not ot hide or show the definition editor Cleanup chore: read swagger document locally and pass to api editor Res merge conflicts Minor changes Fix for Angular 6 upgrade with CLI 7 causing fs not found for yamljs Moving polyfills to polyfills file Moving shims to shims file Rm postinstall script
Minor changes to package.json
@paoloantinori - I resolved the conflicts this morning and squashed some duplicate commits to clean up the history a bit. Are you okay with me proceeding to merge it? |
cc @gashcrumb